Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 17 Aug 2010 22:47:11 +0000 (22:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 17 Aug 2010 22:47:11 +0000 (22:47 +0000)
commit851cbb2acfa2aa97691b7a98c2fcf81027179ba1
tree0cd729cdf143069461bb567eec479c7703417d3e
parentb4f9870a8068769ea9617e0e9aeafe8d6bcb9f4a
parent99d2d90b28069d67b484d220ab1089e42a64be4b
Merge from mainline.